From 2e064b337881a326dd84f78f115d74ceb3034eb9 Mon Sep 17 00:00:00 2001 From: Benjamin Otte Date: Wed, 5 Jan 2011 23:49:40 +0100 Subject: [PATCH] tests: Port testsocket example to not use deprecated APIs --- tests/testsocket.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/tests/testsocket.c b/tests/testsocket.c index e822e13e32..a17a74970e 100644 --- a/tests/testsocket.c +++ b/tests/testsocket.c @@ -281,13 +281,22 @@ static void grab_window_toggled (GtkToggleButton *button, GtkWidget *widget) { + GdkDevice *device = gtk_get_current_event_device (); + + if (gdk_device_get_source (device) != GDK_SOURCE_KEYBOARD) + device = gdk_device_get_associated_device (device); if (gtk_toggle_button_get_active (button)) { int status; - status = gdk_keyboard_grab (gtk_widget_get_window (widget), - FALSE, GDK_CURRENT_TIME); + status = gdk_device_grab (device, + gtk_widget_get_window (widget), + GDK_OWNERSHIP_NONE, + FALSE, + GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK, + NULL, + GDK_CURRENT_TIME); if (status != GDK_GRAB_SUCCESS) g_warning ("Could not grab keyboard! (%s)", grab_string (status)); @@ -295,7 +304,7 @@ grab_window_toggled (GtkToggleButton *button, } else { - gdk_keyboard_ungrab (GDK_CURRENT_TIME); + gdk_device_ungrab (device, GDK_CURRENT_TIME); } } -- 2.30.2